commit a03ac8675725e0f73e11b08ca9d7d395d1a16d15
author Junio C Hamano <junio@kernel.org> Sat Apr 02 04:32:29 2011
committer Junio C Hamano <junio@kernel.org> Sat Apr 02 04:32:29 2011
tree bfaec069d94d13e788e149166c68f4e87773c6d6
parent f2873fdaeac7a9222349346775417f7325801664

Autogenerated HTML docs for v1.7.5-rc0-96-gc4b2c 

git-merge.html

diff --git a/git-merge.html b/git-merge.html index 1c2bfe5..d6de95f 100644 --- a/git-merge.html +++ b/git-merge.html @@ -417,7 +417,7 @@  <div class="verseblock">   <div class="verseblock-content"><em>git merge</em> [-n] [--stat] [--no-commit] [--squash]   [-s &lt;strategy&gt;] [-X &lt;strategy-option&gt;]  - [--[no-]rerere-autoupdate] [-m &lt;msg&gt;] &lt;commit&gt;&#8230;  + [--[no-]rerere-autoupdate] [-m &lt;msg&gt;] [&lt;commit&gt;&#8230;]   <em>git merge</em> &lt;msg&gt; HEAD &lt;commit&gt;&#8230;   <em>git merge</em> --abort</div>   <div class="verseblock-attribution">  @@ -680,9 +680,13 @@  <dd>   <p>   Commits, usually other branch heads, to merge into our branch.  - You need at least one &lt;commit&gt;. Specifying more than one  - &lt;commit&gt; obviously means you are trying an Octopus.  + Specifying more than one commit will create a merge with  + more than two parents (affectionately called an Octopus merge).   </p>  +<div class="paragraph"><p>If no commit is given from the command line, and if <tt>merge.defaultToUpstream</tt>  +configuration variable is set, merge the remote tracking branches  +that the current branch is configured to use as its upstream.  +See also the configuration section of this manual page.</p></div>   </dd>   </dl></div>   </div>  @@ -1120,6 +1124,21 @@  </p>   </dd>   <dt class="hdlist1">  +merge.defaultToUpstream  +</dt>  +<dd>  +<p>  + If merge is called without any commit argument, merge the upstream  + branches configured for the current branch by using their last  + observed values stored in their remote tracking branches.  + The values of the <tt>branch.&lt;current branch&gt;.merge</tt> that name the  + branches at the remote named by <tt>branch.&lt;current branch&gt;.remote</tt>  + are consulted, and then they are mapped via <tt>remote.&lt;remote&gt;.fetch</tt>  + to their corresponding remote tracking branches, and the tips of  + these tracking branches are merged.  +</p>  +</dd>  +<dt class="hdlist1">   merge.log   </dt>   <dd>  @@ -1245,7 +1264,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2011-03-15 23:30:14 UTC  +Last updated 2011-04-02 04:31:58 UTC   </div>   </div>   </body>